More cleanups in linear layout