refactor uts
refactor
finish layout and routes