Add reset
Basic layout
Add icon
Merge branches 'master' and 'ui'