Add highlight to edit
fix merge errors
fix javascript error
Merge pull request #49 from tarynsauer/taryn_styling

Taryn styling