Fix page layout and correct context button