Added range searching and improved UI