Code committed after fixing loading view issue.