Early draft
Minor bug fixes
Added few new features and fixed a few defects
CM: New icons
Minor fixes