big update to fix UI issues from upgrad to Blaze