Minor cleanup in app flow
Update url routing