FIX: revert previous layout edits