LayoutManager and minor tweaks