Changed the layout to version 2.0