backport changes from floobits web