Updated markup and styling
Updated fillclear js to new markup