Polished some layouts.