Last minute fixes to navbar etc