layout changes

Layout changes, menubar, extra fields etc