Fix small bugs with layout.