Version 1.7 - Modifications based on feedback received on LightHouse

Resolved Tickets - #312, #313 and #314