Final views and functionality

Finished final views and functionality. Ready for start of production