ticket:5 change views and template
ticket:5 Last fixes, all tests are OK