All tests green
Refactor answer controller
Refactor answer views
Small changes