Edit mode notification styles and position
Site structure cleanup, renamed some elements