-- update code from Search Issues #11 Fixed and layout have been modified