V 1.7 - Modifications based on feedback received on LightHouse

Resolved Tickets - #304 and #305