Added Safari support, added better positioning