small bug fix and tiny UI tweak