Change settings menu to modal, more style tweaks and bug fixes