Merge "Fixed portal footer alignment"