fixed eager loading bug
made it a bit more responsive in modals