fixed lazy load
little tweaks for non signed in users