added locations, buttons