Moving things around for UI change. Need to work on getting selected list to display