Merge "Fixed userbar issue on home page"