apikeys fix and org view fix
Merge pull request #193 from morpheyesh/0.5

apikeys fix and org view fix