added basic metric, used better layout