Clean up header and implement new list button