Moved stuff around in preparation for different note views