i would be consitant with a routine for sleep, naps, or bedtime. if you want baby to sleep in the crib, that's where i would put LO for both naptime and bedtime. if they are still fussy i'd rub their back and shush them until they fell asleep at this age.
for sleep help i reccomend the "happiest baby on the block". it really helped us for both girls.
good luck