rework layout and clean up names