back-button logic; menu-button logic; style improvements