Added Test UI + More Data Mapped