css issues
Merge remote-tracking branch 'yaniv/master'
sprint 6 fixes