styled the inline editor
merge conflicts