Cleanup

Cleanup on things.. menus and solved Navigation