AF Tools UI improvements.
Merge pull request #107 from kaviththiranga/developer-studio-3.7.0

AF Tools UI improvements.