Updated desgin following skype with Maria.