GenericPanel: Minor layout changes