updated UI complete