Fix general layout