Another attempt to fix layout