Added a modern layout