Move main nav tabs in layout
add login modal to layout
merge with master