Updated Menu and General Page