Small UI tweaks (todo: make ui customizable)