Updated visual layout to match menu based and control conditions.