added new properties, refactored layout
Merge pull request #3 from gonzalovazquez/ui

(feat): added new properties, refactored layout