Main menu improvement