Style update and a better button