Use new directives for editing and viewing.
Merge pull request #16 from LeafCoders/UI-redesign

UI-redesign