updated the design based on a skype feedback with Yona