removed unneeded classes; added texts;
Move the views!