Added auto layout Final