Added Geoffs GUI changes + Andrews Timers + Some more changes by me
asdf
fkn commit pls