Version 1.8 - Modifications based on feedback received on LightHouse

Resolved Tickets - #315