Tidied up some visual layout issues.