some changes for feelgood look and feel