Layout updates to fix display issues