change text, fix bugs
Merge pull request #63 from Verkalets/frontend12

change text, fix bugs