Updated ViewOptions

Added comments + tests