Add edit functionality and change many design