Layout touch ups for viewability
Fixed issue causing screen to switch off at random
Java code styling compliance and logic fix