improved entire layout of edit and listing