Put views in the right place
Add suffix