Clean up the views and add double borders to headings