Final Set of Changes for UI