11634 ui refinements

Merged Christian Hitz requested to merge chhitz/heating-controller:11634-ui-refinements into master Nov 25, 2015