some layouts have been changed.. version 2.2