Added Edit to Reply Comment + other fixes