Refactor bundle and add Twitter Bootstrap