Issue #2274823 by eshta: simplified information architecture.