revert compact layout; work on #518