edit name
tidy up design