Working
Changes
finish layout and routes