Fix viewport
Finished