Test refactor

Improving readability
Business model rename

Improving readbility
Added Topbar menu markup

Dashboard cleanup
Javascript refactor to avoid code duplication