Align boxes, make buttons right size, reformat less files
Get State Machine working