fixed bugs with search & styling