Feature/improve design