Fixed all search utils, added layout to settings modal view