updated with menu screens