Moved placement of clear state button to the theme