Streamline UI & add label. Thanks Sina Bahram.