modifications in layout and class
2nd commit