moved the widgets to where they belong
(cherry picked from commit 804636fa3461b18c11bd92004db46d61d98aa643)