fix last bugs on frontend
Merge pull request #119 from dentrifonov/#116-great-bugfix

fix last bugs on frontend