Add GUI app improvments