Removed unused files, added time picker and validation