Move methods to their right pragma marks
Fix user location dot not showing up