Add presence sensors.  Clean up the CSS a bit to prevent control-blocks in narrow views from having margin while others dont (apparent if youd switch tabs quickly).