fixed loading issues

still waiting on tabs fix and camera fix
Merge pull request #4 from kennehisftw/master

fixed loading issues