timer view fixes, started adding switch support etc