More layout improvements. This is not valid HTML, duplicate IDs.