Added mohak's class and layout