Changing 'samples' to 'demos' + cleaned up views