Feature/new design 2014