Fixes for bootstrap UI