more fixes and cleaning up static files
merging branches, cleaning up and etc