Layout changes and wx sizer tidy up.