updated ui structure