Fixed layouts and added info