Bug fixes and echancements
UI fixes to menubar and modal