Changed the attributes. Added separate display attribute. AH-339

Attributes should begin with capital letter.
Design changes and code cleaning.