changed css style
fixed merge conflict
removed aside for adding entry