Rearranged the panelgrid so that one all buttons align