fixing UI and some tuning
start cucumber
First cucumber test merge
Merge remote-tracking branch 'upstream/master'