rearranged some screens