Added an overall application handler
Fixed a reference error