Final polish for viewport size of 400, refactor