Continuing the dark theme, fixed up borders and headings and pagination