Add some tweaks to coordinates and positioning