border fixes and navbar fixes