Version 1.2 - Modifications based on feedback received on LightHouse

Resolved Tickets - #170, #205, #210, #232, #233, #234, #235, #236, #240 and #242