Ui makeover in some screens