Fixed max-width
added editing stuff
Conflicts