Small UI & bugfixes