Added frontend views
Merge conflict solved