Fix attribute names and descriptions. Change demo layout.