Feature/new desing