Added path view controller
Cleanup on question view controller