Fixed Activity calls and moved classes around