Implement remark presentation
Add remark template
Cleanup