Fixes to the views and home demo