Cleanup UI, make space for number test