Added expanded/collapsed arrow indicator to toggle. Final