Added column layout options to the menu
Minimal misc. changes

Too lazy right now to detail this little stuff
Set default column layout option visually active