Restructure view/route
Fix small bugs.