Add App Loading and Bug Fixes