Changes done for UI