Added unified UI