tidied up layout a bit