Bug fixes on config change events. Added more layouts