Bug Fixes for UI and UFB, refacoring