UI changes, fixed up router