Multiple layout fix + added icons.