Final layout fixes