Bugfix for edit and back buttons falling out of container