Upgraded bind-layout to the latest version