fix header
refactor widget