Bootstrap added + bug fixes (collection)