Added modal view controller and added check for drawer view integrity