Re-aranged widget layout