Typo fixes
Ui improvements

Fixes #177
First attempt on #296
Video modal bugfixes
Merge pull request #301 from laktyushin/master

Typo fixes
Fixed grouping messages

Closes #293
merge upstream