Fixed CSS Issue + Added Metric Screens