2.1

Added all layout