Added a general layout