fix navbar active highlighting
fix ordering of login buttons