Tidied up layout.