Merge skill shots and viewport

This is a pull request that merges the viewport and skill shots.