Major front-end overhaul
Merge pull request #4 from tgrrtt/develop

Major front-end overhaul
Merge pull request #5 from tgrrtt/develop

Major front-end update