Improve design
Add style