improvement for easier merge

Moved tabs back to top of page, should be easier to merge with master
branch