Fixed some service and controller interaction issues, modals work now