Added button highlighting on navbar and adjusted margins because of clipping