took off button , fixed time and name issue