Movied layout classes to be ID and remove of unneeded classes