More Improvements

Removed entire class on class and refactored as necessary
Merge branch 'master' of https://github.com/NateMarder/Showcase-For-Android