Rearranged panels and added address pane