improve some layouts.