Added icons to menu and touched up other UI things