re-order menu items
fix topbar
change email subject line