DC | #4123 |bug fixes and changing button style