fix indentation
more gui work on alarm

damn but it takes to long to do this stuff!