resolved #7, fixed #2 layouts completed