Fixing issue with layouts not working