Finish layout and routes; minus sign in