Rearranged main screen again.