Version 3.7 - Modifications for Android tablet and LightHouse tickets

Resolved Tickets - #279, #280 and #285