ABP UI and Bug Fixes... untested