fixed bug with date
add close button for Andriod