Added better app loading