Completed Refactor to remove BOL from UI