rebuilt and changed layouts