Add more organization
Some visual changes
Add more styles