Fix some main panel formatting