Minor improvements to finish implementation of basic features

* Revised DOM elements
* Revised workflow
* Use official icons