Add error message to edit button, add comments, change some colors and buttons