UI Update + changes to accomodate infrastructure bug fix