Refactor UI
Merge branch 'master' of https://github.com/MilesHD/same-page
Fixed merge issue