Changed layout system a bit to enable backwards compatibility.
Merge branch 'develop' of https://github.com/Soetnowzen/SmartPower into develop