Restore search form and improve design