Fixed layout.
Fixed styles.
Merged.