Rearrange Search and time, and some other minor modifications
one alignment change