Some more layout adjustments