removed dependency on internal layout module