modify widgets
move widgets
small fixes