Rewrote UI implementations