made more changes for UI