Version 1.1 - Modifications based on feedback received on LightHouse

Tickets resolved - #221, #222, #217, #214, #184, #211, #215, #163, #213, #220, #218