Moved some code to viewWillAppear to speed up drawings