Attempt to fix layout