Update #430 - Make sections open and close more consistently