Revert "Per app layout, at last :)"

This reverts commit 9d1f4e8d04ef89871320d0e705b62062e88e8792.