Selection Clean up

Cleaned up Selection functionality toggling accordions