2nd take on fixing username floating issues