changed general layout