Remove tray menu, incorporate command keys