layouts optimized, default values changed