Added UI + Icons