Menu simplification and some other minor UI improvements