Added the basic layout feature