removing silly mssg
fixed conflict
add helpers for outputting the edit spans, use them for menus and sidebars