Few improvements + add edit view