updated #1 ui