Cleaned up a bit and stretched the viewport to fill window