Version 1.3 - Modifications based on feedback received on LightHouse

Resolved Tickets - #235, #258, #259 and #262