Added more UI annotations for better display