fix merge issues, cleaned up duplicate styling efforts, and first round of organizer section tweaks