Jas' recent changes + Vanny's UI