Fix some issues to layout.