UPD: #1225 for MenuModule + small PSR and somes fixes