Minor tweaks
Partly added support for a poweroff button