Lots of menu work

Things look a little nicer, settings screen is much better