Fixed broken assignment strategy
Changed menu layout