feature: fixing layout and adding style
adding styles and layouts
Merge branch 'master' into user-styles
Merge pull request #72 from 4justinstewart/user-styles

User styles