Continued implementation of demo views