Added Menu and Focusing