create working mockup
add fixes in JS
fixed bugs
add styles
rsolve git conflict
delete old code
clear code
uncomited code
merge master and resolve conflicts
Code review and slight fixes
resolve conflicts
fixed bug in frontend
Merged subscription tool and fixed some things