Improvement on UI according to Geoff's new functions