fix navbar highlight and positioning
fix hammer swiping