More layout adjustments

Signed-off-by: Phill Coxon <phillcoxon@gmail.com>