Attempt to fix layout problems for deployment