redesigned current layout