Refinements to the gui layout