Added accordion functionality.  Still needs System Tab