More layout tweaks
Added close window command