Update design to serve better edit interface