Code cleanup
Merge code_update_4
CSS minified