Feature/hackathon new frontend design

Merged Matsuuu requested to merge feature/hackathon-new-frontend-design into master