New UI and small fixes