Some interface tweaking