refactoring complete, minus the namespace problem
couple desktop bug fixes
removed more useless images
removed template
tablet fixes