styling done on index
styling done on edit
Merge branch 'styling'