Add some comments and improved error handling of the manager view
Try to add some comments for doxygen