fix bugs layout and routes