-<form method="get" id="searchform" action="<?php bloginfo('home'); ?>/">
-<div><input type="text" value="<?php echo attribute_escape($s); ?>" name="s" id="s" />
+<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
+<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
+<div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />