Added some stability to pilot version of UI