Updated with Twitter Bootstrap design and nav bar