More design
Merge remote-tracking branch 'yaniv/master'
More design changes by Yaniv