layout improved, routes changed