Merge pull request #13 from openifyit/eff_ui_changes

Update UI
Merge pull request #15 from openifyit/eff_fix

Merge pull request #13 from openifyit/eff_ui_changes