Hotfix for backend + small design changes #60

Closed jakubman1 closed 6 years ago