Added timepicker and fixed ActivityModelViews