changed the layout, added metric labels