restyled add assets form
resolved conflicts