Attempt to fix layout rendering