Decide on right nav bar, minor style updates