Cleanup. Add viewport