[feature/10] Added answer related views
[feature/10] Merge weird conflict