further layout improvements and tidied HTML