Improved navbar on all screen sizes

Cleaned up files