Widget fixes, location fixes