Files redesigned some parts