routing fix and swaped
levels checked
small ui fixes