cleaned up, basic menu