added few components
comment add
added box
added id
aligned
conflict resolved
merged