CSS & HTML refactor
Merge pull request #92 from tgrrtt/develop

CSS & HTML refactor