Feature/new design 2013