Merge pull request #4 from tgrrtt/develop

Major front-end overhaul