Add taxi view controller etc
Remove test controller