Work on demo layout