Revert "updating main view"

This reverts commit d8ce56ad62042f16e219f01615b04e076c53d696.
Revert "more code cleanup"

This reverts commit b4f4cdc6ddeb61700de3940258723ff406df77f4.
Revert "cleaning up some nasty looking code"

This reverts commit 319e49e9e1c8113993ae8a5084908866e71071d0.
Revert "merging 1.0.8 changes"

This reverts commit 85c226cbc5e28f2313c27bee0a339b905e1e3fb3.
Revert "Revert "merging 1.0.8 changes""

This reverts commit ce3c8588865b761c11ae29f5d48f82b3064ef4d4.
Revert "Revert "cleaning up some nasty looking code""

This reverts commit ae6b30b120ff591e3b967f25cbd1e9b7a11d66ff.
Revert "Revert "more code cleanup""

This reverts commit ffae54872b4aeca4250172ee4671b73bdcf8f13d.
Revert "Revert "updating main view""

This reverts commit 384941594d385c1b181196e6f8a00bb494c96d14.
Revert "updating main view"

This reverts commit d8ce56ad62042f16e219f01615b04e076c53d696.
Revert "more code cleanup"

This reverts commit b4f4cdc6ddeb61700de3940258723ff406df77f4.
Revert "cleaning up some nasty looking code"

This reverts commit 319e49e9e1c8113993ae8a5084908866e71071d0.
Revert "merging 1.0.8 changes"

This reverts commit 85c226cbc5e28f2313c27bee0a339b905e1e3fb3.