fixed merged changes; abstracted navbar