merge master to current dev state
fixing scrolling bug
small frontent fixes
add new css
add new css
clean up file dir
Merge branch 'dev'
change to custome css, smal bug fixes