Major UI update
Better UI for search