Minor layout adjustments