Minor look-n-feel improvements