Improved layout further

Next: connect buttons to control all timers