Major changes

- Color policy
- Layout