redesign. working in desktop