Start refactor and topbar modifications
Add modified file