Improved iconography
Refactored viewport JS code