Updated to show some more info and added some markup