Fix #25 - Rewrite controls to be more compact

Remaining issues with alarm zones are wrong on master branch as well, so might as well merge this now. The controls are much more compact and easier to control.