FIXED UI, closed #21