Minor improvements to layout, upgraded the L&F libraries