added box sizing. various cleanup