Cleanup main.php
Comment avatar and app-navigation