updated general layout (2)