added twitter-bootstrap and changed a few things