Bill fixed and UI addons