Final UI added