UI changes + better routing + persisting search
UI changes + better routing + persisting search