fix temp layout and widget