Fixing viewport option seperation
Revert "Fixing viewport option seperation"

This reverts commit 1b3dded4b8f29ee1eeb32a5a86ba1d07d622cb25.
Fixing issues with viewport seperation