menu stuff
rethink the layout a bit
little nicer layout