Add additional View functionality and comments