Repositioned edit and fixed rendering
RE: fix
RE:RE fixed edit button