added drop downs and organization