Added comments & fixed layout