Temporary Basal UI and some fixes