Fix for production build

Copied over views after code reorganisation