Code cleanup & removed input[type=search] (not using it)