Fixed routing bugs
Close/cancel buttons now route properly
Added task popup route