Button margin fixes