Edited navbar and minor changes