cleaned up some codes. still doesnt have edit feature