Remove some unnecessary newlines
Clean-up icon css
Hide embedded form
Add button include and required styles
Add some buttons
Merge branch 'develop' into content