WIP - new design.
Add more styles