Fixed button width
Updated to Swing Layout Bridge to LayoutManager2
Various fixes to layout code and containers