Redo bar colours, add borders to headings and make margins uniform