Added find functionality
Minor UI fixes