Updated and shortened view functions