larger clock, smaller buttons...
panel margin adjust
merge conflicts