minor ui change + fixes