Removed some useless code, added new navbar