Added tab navigation and fixed navbar problems