Removing extra markup and converting #IDs  to .Classes

I think we should be preffer .classes over #ids in other to produce
resuable code (even though now to resuse isnt the case).