Fixes related to the new layout.