Some refactoring in layout
Version 1.3.2 of extension