removed KeepLayout dependency
Put back KeepLayout dependency

KeepLayout makes it much more manageable.