Fixed redirect_to weirdness, refactored db associations