Add ameurant's changes in viewlets