Fixed a few things with the navi bar