Version 1.6 - Modifications based on feedback received on LightHouse

Resolved Tickets - #235, #239, #276, #292, #294 and #295