Better navbar, also redundant code