Few changes to navbar etc