Discovery App improvements