removed fluid, imported non bootstrap code