modified some general layout