Fixed last details and added some more content