Revert 1f117a3..833c688

This rolls back to commit 1f117a3de9a22ee70b4be7066691606a1db5227c.
REFACTOR: Layout Constants