Some minor formatting changes and added main menu call at the end of search method.