Change layout

Replace Select dropdown with form
Move all controls below time