Removed unnecessary class
Fixed some more weird code. Eliminated text classes