Added
Minor refactorization and UI changes.
Merge commit 'ad3dd00fee8782321fca4bb1194e6761c0872dde'