renamed layout constants, renamed LayoutConstants=>Layout