More cosmethic changes
Added search functionality, cosmetic updates