Working on adapting for bootstrap