Added abstract + layout changes