Try to fix layout problems