Bug fixes and changes.

Removing code from callback used only by WP8
Bug fixes
Removing tree structure for components