New design <3

new design with minor bug correction
bug
merge
bug

button
Merge pull request #1 from salimos/design

Design