Adding views and translation, removing scaffolding