Clean code
Add custom buttons
Merge branch 'feature/design' into develop