Fix bug
Adjust normal layout