Fixed issue with layouts