Added The Classes and Layout