Updated Dimension screen to have locks and code cleanup