diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04ae51995a9f3f7ec21a4b6a87b9e10ed193f8d9..f74ad3ca616e735e2645e548e591ccd8dcaa3644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,15 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added (for new features, dependecies etc.)
 
-* `ext_applicable` module for building fancy features which append
+- `ext_applicable` module for building fancy features which append
   functionality to entities (EXPERIMENTAL).
-* `ext_cosmetics` module which converts http(s) uris in property values into
+- `ext_cosmetics` module which converts http(s) uris in property values into
   clickable links.
-* Displaying and interacting with the entity state.
-* Change password functionality for users of the internal user source.
-* Visually highlighted drop zones for properties and parents in the edit_mode.
-* two new field types for the form_elements module, `file` and `select`. See
-  the module documentation for more information.
 - Added a menu/toc for the tour
 - Added a previous and next buttons for pages in the tour
 - Added warnings to inform about minimum width when accessing tour and
@@ -24,19 +19,55 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added a tutorial for the edit mode to the documentation
 
 ### Changed (for changes in existing functionality)
+
 - Updated from bootstrap 3 to bootstrap 5. This is a major change which will
   possibly break existing custom implementations (e.g. a custom welcome page)
   since a lot of classes where renamed by bootstrap an other classes have been
   dropped entirely (e.g. "jumbotron"). Please have a look at
     * https://getbootstrap.com/docs/5.0/migration/
     * https://getbootstrap.com/docs/4.6/migration/
+
+### Deprecated (for soon-to-be removed features)
+
+- css-class `.caosdb-property-text-value`. Please use
+  `.caosdb-f-property-text-value` or `.caosdb-v-property-text-value` instead.
+
+### Removed (for now removed features)
+
+### Fixed
+
+- #212 - form_elements: Drop-down menu shows wrong value after clicking "None"
+- #202 - Make filter fields in edit mode toolbox visible
+- #117 - Reload data model after adding an RT or a Property
+- #214 - Paging panel is hidden.
+- Displaying issues with long lists in property values
+- An issue whereby a grey container would appear above the map when
+  changing the map view.
+- #200 - Re-enabled the file-upload button
+
+### Security (in case of vulnerabilities)
+
+## [0.3.1]- 2021-06-15
+
+This is the last Bootstrap-3 compatible release.
+
+### Added (for new features, dependecies etc.)
+
+* Displaying and interacting with the entity state.
+* Change password functionality for users of the internal user source. Disable
+  with `BUILD_MODULE_USER_MANAGEMENT=DISABLED` and set the user realm with
+  `BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM=CaosDB`.
+* Visually highlighted drop zones for properties and parents in the edit_mode.
+* two new field types for the form_elements module, `file` and `select`. See
+  the module documentation for more information.
+
+### Changed (for changes in existing functionality)
 - The heading attributes datatype, path, checksum and size are now placed 
   in a `details` html element.
 
-### Deprecated (for soon-to-be removed features) 
+### Deprecated (for soon-to-be removed features)
 
-* css-class `.caosdb-property-text-value`. Please use
-  `.caosdb-f-property-text-value` or `.caosdb-v-property-text-value` instead.
+* Any bootstrap-3 dependencies. Please prepare upgrading to bootstrap-5 with the next release.
 
 ### Removed (for now removed features)
 
@@ -49,18 +80,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- #212 - form_elements: Drop-down menu shows wrong value after clicking "None"
-- #202 - Make filter fields in edit mode toolbox visible
-- #117 - Reload data model after adding an RT or a Property
-* #214 - Paging panel is hidden.
 * #156 - Edit mode for Safari 11
 * #160 - Entity preview for Safari 11
 * Several minor cosmetic flaws
 * Fixed edit mode for Safari 11.
-* Displaying issues with long lists in property values
-* An issue whereby a grey container would appear above the map when
-  changing the map view.
-* #200 - Re-enabled the file-upload button
 
 ### Security (in case of vulnerabilities)