inline comments, rearranged some views