Updated general layout