Button and margin changes