Update Barbato layout design

Screenshots available here: http://imgur.com/a/kIE8z