Adjust layout issues