clean up geo logic and added types to view page