Change layout and add some other details