Modified layout as recommended.