Small fixings, UID for Database instead of Intent extras