Fix final layout issues