#230 #231 CA/NH Changes to UI