V 1.4 - Modifications based on feedback received on LightHouse

Resolved Ticket - #264