Minor Changes for Button