Fix Bug, Add Edit button