Removed obsolete code.
Implemented switcher.
positioning the clouds
.
Merge branch 'master' into Estel-Work