Finish layout and routes v3