Update the content panel and relevant functions

Also fixed and error in View interface. About to make the changes
handled in uni