fixes issue #1894
Merge pull request #2035 from FinalAngel/feature/fixes

Frontend fixes