Minor UI tweak + refresh button preparation