- improved general layout