Feature/lab review

UI router lab sweetness