login fixes, conditional icon/displaying of bookmarked and watching