Adding the functional and the roombased views

Added the functional and the roombased views as well as some smaller code changes.