Fixing button behavior and changing a class name.