layout & testing beautifier
Finish layout and routes