tested with UI and made fixes accordingly
Merge remote branch 'origin/Iteration3' into Iteration3