Fixing small things and login tag