restructuring and adding twitter bootstrap