Improved userBlock and few minor fixes
Merge branch 'master' of github.com:dmarynych/upfront