Buttons sized according to icons size.

Ignoring comment string in xml.
Some bug fixes