Card #100 code refactor, combining code modals and controllers