locationbuttons + cleanup