Page features.
Groups reorder.
Bug fixes.
Merge commit 'f3981710889445b687a1f87c0fad494d6d657f35'