Merge new content from design to master

Remove the garbage comments