little fixes
Merge branch 'master' of https://github.com/BuzzStop/frontend
undo hack