finish layout and routes v2