#12 (1.5hours) Style as per design item
#13 (1.5hours) Alter domain model