Cleaned up header row toggling. Fixes #18