Button and margin fixes