removed to-do's and rearranged views