routing + some UI changes