Restructured to include menu screens