More renaming, changed activities to sherlock fragments for future ease
of use