UI Dashboard Fix