Refactoring new full task adding layout